--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Commit 005d71707c1f99a721e78196e2ecfad1df1c11fa
Changes
Diff
diff --git a/LXMF/Handlers.py b/LXMF/Handlers.py
index 0705074..5671170 100644
--- a/LXMF/Handlers.py
+++ b/LXMF/Handlers.py
@@ -1,4 +1,5 @@
import time
+import threading
import RNS
import RNS.vendor.umsgpack as msgpack
@@ -17,10 +18,11 @@ class LXMFDeliveryAnnounceHandler:
if lxmessage.method == LXMessage.DIRECT or lxmessage.method == LXMessage.OPPORTUNISTIC:
lxmessage.next_delivery_attempt = time.time()
- while self.lxmrouter.processing_outbound:
- time.sleep(0.1)
+ def outbound_trigger():
+ while self.lxmrouter.processing_outbound: time.sleep(0.1)
+ self.lxmrouter.process_outbound()
- self.lxmrouter.process_outbound()
+ threading.Thread(target=outbound_trigger, daemon=True).start()
try:
stamp_cost = stamp_cost_from_app_data(app_data)
@@ -55,10 +57,8 @@ class LXMFPropagationAnnounceHandler:
pass
if len(data) >= 3:
- try:
- propagation_transfer_limit = float(data[2])
- except:
- propagation_transfer_limit = None
+ try: propagation_transfer_limit = float(data[2])
+ except: propagation_transfer_limit = None
if destination_hash in self.lxmrouter.static_peers:
self.lxmrouter.peer(destination_hash, node_timebase, propagation_transfer_limit, wanted_inbound_peers)
diff --git a/LXMF/LXMRouter.py b/LXMF/LXMRouter.py
index d502ee6..8da1476 100644
--- a/LXMF/LXMRouter.py
+++ b/LXMF/LXMRouter.py
@@ -2301,8 +2301,7 @@ class LXMRouter:
else:
RNS.log("Outbound processing for "+str(lxmessage)+" to "+RNS.prettyhexrep(lxmessage.get_destination().hash), RNS.LOG_DEBUG)
- if lxmessage.progress == None or lxmessage.progress < 0.01:
- lxmessage.progress = 0.01
+ if lxmessage.progress == None or lxmessage.progress < 0.01: lxmessage.progress = 0.01
# Outbound handling for opportunistic messages
if lxmessage.method == LXMessage.OPPORTUNISTIC:
──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────